projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 772edb0 dc3c668)
bitkeeper revision 1.1159.240.2 (42028548cWA5UfVOtIVVGp5n3bPOKQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 3 Feb 2005 20:10:48 +0000 (20:10 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 3 Feb 2005 20:10:48 +0000 (20:10 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/x86_32/entry.S patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/x86_32/entry.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.